2feee4
@@ -137,8 +137,10 @@
public void merge(AggregationBuffer agg, Object partial)
       throws HiveException {
     MkArrayAggregationBuffer myagg = (MkArrayAggregationBuffer) agg;
     List<Object> partialResult = (ArrayList<Object>) internalMergeOI.getList(partial);
-    for(Object i : partialResult) {
-      putIntoCollection(i, myagg);
+    if (partialResult != null) {
+      for(Object i : partialResult) {
+        putIntoCollection(i, myagg);
+      }
     }
   }
 
